fixed
merge conflict market controller