corrected automatic merge annotation failure