resolved autolayout issue in 4sin old build
Resolve conflicts