Conflicting file changes were missing from merge