branch3 commit for conflict
fixed merge issues