Debut debuggage
Fixed conflicts and merge