modified from command line for a conflict
final change