Add conflict_resolution
input
#417
Merged
Loading
conflict_resolution
input
#417