Updating to force a conflict
merge fix