users broken git merge has deleted several files