Merging fixes live.