Fixing conflicting template issues
Merging...