Attempting first merge