Yes, and during the conflict input window on the page to enter the trips it will tell you exactly how many credit hours you can make up.