Fixed bad merge commits