resolve master conflicts
firstpass changes