force eric to handle a merge conflict here too