merging changes from movement-feature