'status --reset' should remove the conflicts as well