Merge conflict fixes for kjpou1