fix conflic code