Resolved conflicts with locally unsaved files