Fixed an error with "template within template" argument
Fixed merge conflict