Commit by user2
Resolved conflict