unbreak merging shits