Updated version without conflicts