renabled merge correction, with fix