adding code to check if merge successfully or not.
if not merged failed, inform user to fix conflict on command line.