git ignore
save file
solved conflict