Still Enemies?

two enemys Oliver and River but in constant fight soo the principal decided to put a end and made them share one dorm for a year .... what happens are they still enemys or something else.

Also the pictures used is Al