local commit
fixed merge problem