commit at fork 2

Make how to merge with conflict