reset config remote
fixed merge conflicts