Corrected error + started on Copy all button
merge