added requirements
register login
conflict resolve