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