resolved additional merge conflict