Creating template
Fixing conflicts
db.properties