merge allen master