merge conflicts in import_helper and tickets_show