Merge conflict leftover?