Correct unforeseen errors on merging