ror
merge