Changes that need to be merged