yassnippet for php-mode
submodule conflict fixed