Fixed the merge errors as to be honest I don't fully understand the git merge operation from command line