bump that includes a merge warning! hooray