Bring halmamaterd in line with master