add forever to the list of requirements
fix a critical bug on signup
conflicts resolved