Syntax changes that were introduced as a result of conflict resolution