I have added and modified all wishlist functionalities
removed conflicts