Save point
fix merge conflicts
Removed unused code after merge. Attepted fix at cell autolayout contraints