fix messed up files from merging