fixed conflicts from stashed