create feature1
add date in master
conflict fixed