merge+ bugfix(some item was added twice)