Slight fuckup resolving conflict