Resolved minor conflict