Day One old changes and merged conflicts