resolve 2.12 conflict