merge resolution 2