fri 1st working integration
conflict resolution