useless commits I'm forced to commit from bad merge
useless commits I'm forced to commit from bad merge 2