templates: fix merge conflict left-over

* Fixes merge conflict leftover in a template introduced in
  990031546d9dd70bda921ca8a788ed82513925d8.  (PR #505)

* Also fixes indentation of the file.

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>