Removed merge comments from code