possible 2nd merge