Merge AccountSystem into Economy