before pulling
resolve conflict
bugfixed
create pivot query for insert into model