[FIX] Fixed wrong merge