merge issue complete. WORKING