Removed rebase conflict artifact.