some edits
resolve merge conflicts