first commit
documents partially done
conflicts solved