Fix somethings wrong because merge