Removed spurious System.out.println that sneaked into the merge again