Fix setup
Addressed conflict