this looks good
fixed merge conflict, deleted person