first rev
resolve merge conflicts