merge fix
attack fix