reverting to Before & After Adding Item by Jeev
deconflicting