Merge conficts fixed.