Small semantics changes
Resolve conflicts