modified git ignore
merge conflict