add feature to remote branch
add remote commit in master
resolve commit-remote.txt conflict