fixing minor conflict between stashed local changes and upstream