added feature
fixed merge