Merge Development after dealing with notconverted and mixed strategy