Created a new commit with a merge conflict
keeping Jamies Changes