madeye work
merge resolution