first commit. add files
resolving conflicts