edited issues with merge