Rollback to end of stage 2 and reapplication of changes
Next try to fix this horribly botched merge.