fixed the merge issues