commit local change
merged master conflict