david 28/12/2014

remove some conflicted codes