Fixed pre-flop merge conflicts