fix lost merge conflict