first pass
resolve merge conflicts