Some more conflicts merged