Should merge automatically
Resolved conflict