Fixed Height Scaling
Resolving conflicts