fixed all
merge master