add exceptions
after merge.add exceptions