fix confilct issue