Fix additional merege conflicts