sdfssf
sdfsdf
commit conflict
Commit from master
edited conflict line
fixed conflict