Enhanced comment on poor error handling
Better API error logging
Maintain "cannot merge" label