the resource order is now asked for by human strategies
solved merge conflict