backup options before remote merge
fixed merge