Fixed merge conflicts. And removed useless implemented function