jar issue with merge
conflict resolved