nicole responsive
merging