You've left in merge resolution lines