Conflict fixes 02