fixed bug on mind
fix merge