add some additional positions
resolve merge conflict