final merge commit Nicole and Lucy