Recompile template with '<<<< HEAD' in it

Change-Id: I8b9847e5d8e39c410966697f89afc22b7fa567f4