Fix regression introduced in #218 conflict resolution
Merge pull request #220 from geekwright/master

Fix regression introduced in #219 conflict resolution