merge master bates