Fix merge conflics between dev and ajax_likepost