possible conflict
Merge branch 'master' of https://github.com/chuck1/nebula
Merge branch 'master' of https://github.com/chuck1/nebula
kernel