Add an appropriate error for the merge scenario, for now.
Allow signal handlers to run.