Adding files in git repo
Resolving some merge conflicts