CONFLICT

not really finished at all