Fixed merge script error comments.... again.