setting up some basic base template stuff
fixing merge conflict