Finally resolved conflict