few edits on libraries
few edits on libraries
fix conflicts