Pull conflict resolved