merge in changes \n from accidentally dupe folder