readded branch to merge template