Minor conflict resolved