change gitigonre
merge conflict