regfistration popup and about us page
conflict resolved