Add akorr and rkorr strings
Handle conflict