test conflict
hhhss
resolve conflict
m
manual