Fixed merge conflicts between nick and lisa.