rebasing conflicted comments