initial commit of simple merging script