Some merge conflicts?
Merge branch 'master' of github.com:zardoru/raindrop
Merge branch 'master' of github.com:zardoru/raindrop
Put miss in as its own judgment.