#589
fixed conflict