changed gitingore
fixed conflicts