Fixed issue with merge