Converting to PHP scripts
conflict resolution