Changes document
Fixes merge