Fixes funny stuff caused by merge