lgtm.  I resolved conflicts originally, and creation still works.