fix mis-merge