[issue #176 #170 #169] [MC] fixes a error due to solving conflicts