Re-merging and such