Debugging version
Handling binary conflict