/:did/:repo/merge is only ever used when actually performing the merge, so by this point all conflicts should've been rectified and the merge *should* succeed. This is the appview's responsibility. /:did/:repo/merge/check checks for mergeability, and can be used to repeatedly check as the supplied patch is updated by the submitter.