updated jar without
stashing for merge
merging