git cli commit to fix cherry pick
fixed merge conflict