update activity urls and fav to likes migration
resolve conflicts