change enemy sprite
fix merge