Separation of concerns
Fix conflicts