Changed merge script to only merge the current commit