New Rock tutorial 'Merge changes to rock-core