upgrade to latest elixir
fix merge conflict