merge will phils changes