Resolve conflict.
Regenerate website