fixed merge conflicts with erica