bug fix
merge resolve