[FIX] Resolving conflicts