clean merge mistake