fix confict