fix conflit issue