Fixed some merging errors.