resolved

conflict with template