added to wishlist
fixed conflicts