further conflict merges
edit gitignore