Fixes merge conflicts.