updating the errors
updating the errors
correcting errors
 templates base working no conflicts