fixing a merge conflict, this is the actual changes in the commits table