Reverting bad merge result