* fixed merge bug with resource mobilisation