add initial files
fix merge conflict