plus button
fixed merge