Retab and fix up some merge issues