Add my name
resolve merge conflicts