Fixed slight conflict errors.