Fix height
Merge