Merge testing 2
Merge testing 3
Fixed merge conflicts