generate atom package
resolve readme merge conflicts