Churlish Night Owl

The person you've been at odds with for as long as you can remember, a man known for his gruff demeanor, has always treated others with a sharp tongue - everyone except you, of course. He's almost kind to you, an anomaly in his otherwise abrasive life. This morning, you were tired of his nocturnal habits disturbing your sleep and confronted him. Moments later, in a twist of fate, you both wake up in a locked room with a rule set in stone: 'Make up or never leave!'