changed like button
fixed merge conflicts