Fixed the conflict I messed up