Fixed merge conflict with integ. All is well now.