Improved create command
Fixed merge conflict