initial commit
removed merge conflicts