fix conflic