Makes some changes
Fixed merge conflict