Added bio
Resolved conflicts
Resolved conflicts