change all file types to php
fix merge conflict