Fix the merge.
A temporary fix.