To resolve a conflict directly in Magit, type k on the conflicting file and select which side to keep:

Key	Description
k o	keep ours
k t	keep theirs

This works on hunks too.

Alternatively, type RET to open a file with the Smerge mode enabled.