CLI automatic resolution on merge operation