fixing issue with merge