Slowly getting there
Resolve conflict