fix style error
merge error caught