finished bad merge issues