Hopefully resolve conflict