Github user YehEmily commented on the issue:
https://github.com/apache/geode/pull/591
@kirklund The conflicts have been fixed! Thanks for looking over this!--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
