merge and update ignore