merge + ignore