done merging
Commiting all