merge commit fixes