fixing .git dir
merge conflict