add versions to build matrix
resolve conflict