weird conflict behavior fix