Conflicting codes

Resolved