fixed signup, corrected merge conflict in index
resolving merge conflict