merged stashed files