Issue #174 - Solve conflict