Merge conflicts should be less frequent

[benel]

Description

Which part should be improved? For better performance or maintainability?

Most of pull requests end with edit conflicts on:

• App.css,
• context.rb,
• event.rb,
• outcome.rb.

Why is it important and for whom?

The maintainer loose time on this.

Which solutions have you thought about?

Step definitions and styles that are related to a single page could be split into distinct files.