setting myself up for a conflict
fixed stash conflict