Merge Script fixes