added dummy json php
fixed merging issues