Fix conflict on merge