Please help me find a yaoi with the little mermaid theme, they were the mermaid and prince...

Please help me find a yaoi with the little mermaid theme, they were the mermaid and prince in their past life, both of them are now in college. The mermaid can remember his past life and the trauma alike, have amazing singing voice, he have a cross dresser roommate, freeze up when the prince is in sight or even mentioned, cant talk in front of him. The prince is majoring sound engineering, is doing sound for a student movie project, took interest in the mermaid because of his voice at first and want him to sing the movie's theme, cant stop feeling drawn to him. If you can help me find this a thousand thanks!!!