needed to commit before a pull
fixed merge conflict
finished transaction parse for lib/test