:dude: remove merge fault