Fix issue with merge