resolve conficts
add-authentication wip