Updated noreply email in config file
Merge conflict