Fixed git merge headings
Fixed merge errors