Minor changes
Fixed minor conflict