Fixed git files
Merge conflict