partial merge need to push from eggenburg before final merge
conflicts resolved