merging everything we currently have
adding all current files and merging