Fix compile
Remove conflict marker missed