fix dependecies to template
fix conflicts