Solutions done
Cherry picking I think
Not sure what is happening
what is happenning
Fixed merge conflict
testing something
maybe this will work