disabled merge, encode fields clearly, tests passed