minor
merge resolution