Code with errors.
Merge fixed.
Second merge fixed.