first commit
fixing merge