Getting ready for merge
Fixed merge conflict