merge conflict fixed from richard
fix the problem