messed up merge resolution last time, this one is right