change signup jquery
merge conflict