Try to fix missing missing NL at EOF.
Add comments to instructions.
Try to fix newline issues.
Fix conflicts. Don't know from where they come from.