Merge conflicts fixed.