Removed my comments from previous merge conflict.