readded things removed in someone's merge