Edited for conflict