Changes after removing conflicts