[+] Fixing conflict