Templates
fix conflicts