Resolved conflict fix