Restored my changes from yesterday lost in merge resolution.