Fix merge mistake
Fix file order