update rythmWebsite configuration
resolve conflict