Merge conflict : add ignore