add method resolve
merge and comment section of code unusable