[#958] Fixed Conflict