test push
added barcode
merge conflicts and adding barcode