Bad commit
Merge fixed