git local commit
Merge resolved