manuelmerge + enemy moving update