Masses redo after conflic; instead of rebase (same code)