cleaning up some merge sh*t