2014-01-07 merge conflict fix

2014-01-07 merge conflict fix