Fixed some merge-related errors.