movement and enemies modified
merge