edited lvl 1
solved conflicts