switched to php
resolved conflicts