moved project directory up to htdocs and fixed merge function to allow for creation of new columns