Added <?php ?> tags to  and added code to remove them to
Fixed strange conflict bug