fixed few minor conflict leftovers