bug: removing the wrong version on conflict