bringing back file to resolve conflict