Resolve after merge