some files deleted due conflicts