Updated gitignore
fixed merge issues