removed merge marker from Changes