Fixed the weird conflicts