removed melee combat and mouse movement
merge