commit #7 on a new testing branch
commit of first conflict cause
merged changes