first commit
solving merge conflicts