little fixes
fixed merge