All Works Well, Merge and Clean

...
More Merge and Clean

...