first commit
fixing merge conflict