Fix this file after the merge.