add gulp files
confilct