initial commit
fixing merge conflicts