fixing differences after merge