Failed Merge repaired and more comments added