fix routes files and solve merge conflicts