Helper Scripts, Merge Fix