pushing with gitignore
Merging after conflict