EDIT: Fixed conflict