fixed print issues
conflict resolution