added merges to gitignore