Merge is working
Merge testing...
Clean up
Added guard