fixed update
fixed merges