fixed bad merge, and things