Fixing merge problem in symfony.tpl