finish changes to merging + error + completeness script