Merge + Error removal complete