Change moving card logic
Merge master