Fixed: Conflict merge