conflict 3 solved
commit 4 linux rebase