11:35 commit
small changes
fixed merge conflict