fix a conflict