Merge conflict
Syntax