template whitespace merge conflict fix