reorganize merged changes (not tested yet)