Merging and fixing