updating te old file for conflict