Resolves conflict as outlined in #1000

No description necessary.