shah-andrew-merge