merge fixes before starting feature