Added star button
fixed merge