mitigate a bug where we enter nano(1) to resolve merge conflicts, and the provisioning hangs as a result
mitigate a bug where we enter nano(1) to resolve merge conflicts, and the provisioning hangs as a result

dcmorse/contra,dcmorse/contra,dcmorse/contra