finally got the latest commit message by user working
fixed merge conflict in schema