Corrected some merge-errors.