Remove duplicate entry and fix order
1 file changed