ci 1 and sqush c1 and c2
ci4 and ci5
ci6
merge temp and master branchs