20130909 yuri
fix conflicts