nor fixed
merge