Added a conflict
Resolving merging conflict