Conflict fixes