Reformat deps and resolve conflicts related to OTP17