issues with merge corrected