Random Change
Fixed conflicts