deleted conflict files, gitignore edited