PCT-562 Fixed repeated import after merge