online changes (Updates with merge)