Initializing git repo
merge conflict fixed