Debugging
Fixed conflicts