pretty print
resolve merge