fixed 4B numbering and removed E2 question on rebase
fixed merged conflict in 4B and removed rebase question