merge failure changes