uncommenting code
changes
conflict resolution