trying to merge user-edited files
seemed to have worked