Remove conflicts
Improvements