fixed log error message
resolved conflict