merging
push new modified ignore