first draft for a merging script for our branches in sfa