with conflicting readme
see if this commit with confict works