Many fixes 

Merge problems and kernel build 
Next time do not push immidiatly ;)
Check