Code with motion
Code with motion, conflicts resolved