remove old merge conflicts
still problems with relocating a directory