Initial cut
merge resolution