fixed unfound merge conflict