Fix whitespaces missed by merge tool