Actually fix the merge this time.