Git Stash Apply Merge Conflict