Threerty commit from local
Fourty commit from local. With a conflict solved