add files and source code
fix merge conflicts