added 3rd line
conflict resolution