Updated depedency to beberlei/assert
Fixed merge conflicts