Rewrote the merge process