minor: conflict