Fixed bad merge