Merging and fixing engine