log updated - sync and merge fixed