Fixed: Corrected git merge result.