add content before pull request
resolve merge conflicts