Resolved conflicts in syntax