fix the merge issues