Resolve conflict for Elliot