update from cmd line merge