Restored merge error.