merge with rtong