add initial version
fix merge conflict