Edited out conflict code