Elaine: non existing merge conflicts?
Elaine: fix conflicts