Added diaries_milestones table
Fix conflicts