Hello Jacob commit
solving merge conflicts