merge for Nicole

this one will have conflicts