Testing a merge conflict
modified with style issues
modified with syntax issues