Fix conflicting merge