Merge doc fix