vendor file added
added formatting changes
demo commit of cosmetic changes
merge conflicts