fix merge script

Change-Id: I42c57e1d05dba5502b5095a4347aee04e08593c7