Resolve conflict and merge changes

Fix unresolved conflict.