fixed little bug in enemy movement
merge conflict... :/