recovering merge mistake