fixed merge errors...oops