merge in fix loop