checkout fix
merge