[FIX, FEATURE] Removed some merge conflicts and a const problem.