first commit
fixing merge conflicts