Fix merge conflict cruft in dockerfile