All local changes since yesterday, fixing merge conflict