Update & fix migrate & repair conflict @pauldub