accepted on join fix
merge