huge merging bug template fix