fixed positionings
conflicts resolved