Refactoring and adding page objects
Solving merge problems