Generating 6 controllers and configuring routes
Fixing merge conflicts