Resolve issues & changes