lib files added
conflict resolved