Manually fixed merge conflicts.