Updated merge conflit file
Conflict resolved