Joseph Tan merges with Koh & Choo