Unit show copy pasta
Merge conflicts resovled