Issue #1. Fixed conflicts