Remove Merge Conflict

Remove merge conflict in setup script