first major commit
resolve index conflict
resolve CNAME conflict