Third commit
Resolved conflict