removed  some merging things