Fixes merge problem.