Lame merge problem is fixed now.