Humble beginnings
Resolve conflicts