first commit
solved conflicts