merge dec1

merge dec 1