trying to merge everything
updating files for merge