better roommate selection
fixed conflict