going to conflict
merge resolution