autolayout conflicts resolved