commit
commit before merge
add loading data exception