Resolve fuckup conflict