Improve craft
Fix merge conflict