Automatic merge failure manual addition