added and resolved