correct name gitignore
fixed conflicts