Adam/resolve merge conflicts

@nasthagiri , this was the line with the merge conflict. Does this look right?