commit
fix conflicts
modified lib.sh