Trying to make bnt work :(
Fix merge conflict