2am merge