fix conflicts in remote
merge conflicts