code merged:: after stashed issue