fixes merge conflict
fixes merge conflict #2
adds tiny 'api'