I didn't do anything, but github is making me commit.
Fixed conflict with Tool Tab.