Bug fixes, cleaning of code
Conflict fixing