Roll back feature merge