fix the conflict once and for all