reverted back to template before merge errors