Quick fix for last commit.

Merging failed with these two files, retrying.