Removed merge conflict remainder.