merge of stashed changes