Solved merge problem of last checkin.