Edited recent activities
fixed conflicts