added course registration
fixed merge conflict