migration to 2-locks resolution