[cinder]Need some help for merging the bug fixing commits