a conflict, especially about something serious - Logan is angry about Alec putting himself in danger or vice versa, disagreeing about how best to fight for transgen rights, one's not sure the other is over Max, whatever

would be happy with making up of any kind - tenuous and temporary treaty or make-up sex smut or clearing up a misunderstanding or whatever you want. (feel free to just mention what the fight was and just do making up if that's what you like)