final merge with maz before merging with sarah