Resources + unit movement
Merge conflict resolved