resolved minor conflict