merge

things where missing. trying to find out why