Pushed out bio. Resolved conflicting branches