LPS-39145 - Source formatting

LPS-39145 - Remove conflict message