bug fixing
fix confilct