Resolving the wrong changes due to wrong merge with origin/feature-encj ... branch