Resolved conflict second time