resolved auto layout conflicts