user2 freaking out
solving conflict