Fixed merge conflicts from friends branch