fixed
solved conflicts