Removing added syntax after GIT Merge