fixied copy error - pre merge
breaking git
hi
grand merge apperently no problem