Added conflict comment