Updating for merge