properly handle invalid statuses
API update
merge