Rewrite for crafting conflicts