made changes on a new Conflict2 branch
conclift.java added
conflict resolved with Conflict2.java