Repositions content
fix merge conflicts