incremental commit - moving towards a simple merge script