fixed achievements
merged conflicts