init commit for prototype
fix merge conflicts