fixing the first merge