fix merge and change general gray