fixed minor errors
fixed merge issues