Testing template conditionals
Testing template conditionals
Fix block syntax error
Remove redundant IP line
merge conflict fix