fixed conflit error