Hopefully this fixes a few files that failed a merge