history files added
trying to fix conflict
still trying to fix conflict