add companyorigin
add branch from dev
AND simple
& simple
confict fixed
no-ff
merge with -no-ff