Resolve conflict files