merging stashed changes
added option to select attributes in probe