Fix the issues from the merge.